154. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-07-21 10:22:12 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

154.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/WeltPixel_Quickview/templates/product/viewgallery.phtml2021-02-22 03:20:56 +0000
2/Applications/Ampps/www/Porto v4.0.1/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/WeltPixel_Quickview/templates/product/viewgallery.phtml2021-07-15 02:50:10 +0000

154.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged2296
Changed00
Inserted110
Removed00

154.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

154.4 Active regular expressions

No regular expressions were active.

154.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Copyright © Magento, Inc. All rights reserved. 3  * Copyright © Magento, Inc. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6  6 
7 // @codingStandardsIgnoreFile 7 // @codingStandardsIgnoreFile
8  8 
9 /** 9 /**
10  * Product media data template 10  * Product media data template
11  * 11  *
12  * @var $block \Magento\Catalog\Block\Product\View\Gallery 12  * @var $block \Magento\Catalog\Block\Product\View\Gallery
13  */ 13  */
14 ?> 14 ?>
15 <?php 15 <?php
16 $helper = $block->getData('imageHelper'); 16 $helper = $block->getData('imageHelper');
17 $porto_helper = $this->helper('Smartwave\Porto\Helper\Data'); 17 $porto_helper = $this->helper('Smartwave\Porto\Helper\Data');
18 $_config = $porto_helper->getConfig('porto_settings/product'); 18 $_config = $porto_helper->getConfig('porto_settings/product');
19 $image_width = (isset($_config['ratio_width']) && $_config['ratio_width'])?$_config['ratio_width']:600; 19 $image_width = (isset($_config['ratio_width']) && $_config['ratio_width'])?$_config['ratio_width']:600;
20 $image_height = (isset($_config['ratio_height']) && $_config['ratio_height'])?$_config['ratio_height']:600; 20 $image_height = (isset($_config['ratio_height']) && $_config['ratio_height'])?$_config['ratio_height']:600;
21 $aspect_ratio = (isset($_config['aspect_ratio']))?$_config['aspect_ratio']:0; 21 $aspect_ratio = (isset($_config['aspect_ratio']))?$_config['aspect_ratio']:0;
22 $thumb_width = 100; 22 $thumb_width = 100;
23 $thumb_height = 100; 23 $thumb_height = 100;
24 $thumbnail_type = 'horizontal'; 24 $thumbnail_type = 'horizontal';
25 ?> 25 ?>
26 <?php 26 <?php
27 $images = $block->getGalleryImages()->getItems(); 27 $images = $block->getGalleryImages()->getItems();
28 $mainImage = current(array_filter($images, function ($img) use ($block) { 28 $mainImage = current(array_filter($images, function ($img) use ($block) {
29     return $block->isMainImage($img); 29     return $block->isMainImage($img);
30 })); 30 }));
31 if (!empty($images) && empty($mainImage)) { 31 if (!empty($images) && empty($mainImage)) {
32     $mainImage = $block->getGalleryImages()->getFirstItem(); 32     $mainImage = $block->getGalleryImages()->getFirstItem();
33 } 33 }
34 $mainImageData = $mainImage ? 34 $mainImageData = $mainImage ?
35     $mainImage->getData('medium_image_url') : 35     $mainImage->getData('medium_image_url') :
36     $helper->getDefaultPlaceholderUrl('image'); 36     $helper->getDefaultPlaceholderUrl('image');
37  37 
38 ?> 38 ?>
39 <div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder"> 39 <div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder">
40     <img 40     <img
41         alt="main product photo" 41         alt="main product photo"
42         class="gallery-placeholder__image" 42         class="gallery-placeholder__image"
43         src="<?= /* @noEscape */ $mainImageData ?>" 43         src="<?= /* @noEscape */ $mainImageData ?>"
44     /> 44     />
45     <div data-role="loader" class="loading-mask"> 45     <div data-role="loader" class="loading-mask">
46         <div class="loader"> 46         <div class="loader">
47             <img src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/loader-1.gif'); ?>" 47             <img src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/loader-1.gif'); ?>"
48                  alt="<?php /* @escapeNotVerified */ echo __('Loading...') ?>"> 48                  alt="<?php /* @escapeNotVerified */ echo __('Loading...') ?>">
49         </div> 49         </div>
50     </div> 50     </div>
51 </div> 51 </div>
52 <!--Fix for jumping content. Loader must be the same size as gallery.--> 52 <!--Fix for jumping content. Loader must be the same size as gallery.-->
53 <script> 53 <script>
54     var config = { 54     var config = {
55             "width": <?php /* @escapeNotVerified */ echo $image_width; ?>, 55             "width": <?php /* @escapeNotVerified */ echo $image_width; ?>,
56             "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height') 56             "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
57                         ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>, 57                         ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
58             "navtype": "<?php /* @escapeNotVerified */ echo $block->getVar("gallery/navtype"); ?>", 58             "navtype": "<?php /* @escapeNotVerified */ echo $block->getVar("gallery/navtype"); ?>",
59             <?php if (!$aspect_ratio): ?> 59             <?php if (!$aspect_ratio): ?>
60                 "height": <?php /* @escapeNotVerified */ echo $image_height; ?> 60                 "height": <?php /* @escapeNotVerified */ echo $image_height; ?>
61             <?php endif; ?> 61             <?php endif; ?>
62         }, 62         },
63         thumbBarHeight = 0, 63         thumbBarHeight = 0,
64         loader = document.querySelectorAll('[data-gallery-role="gallery-placeholder"] [data-role="loader"]')[0]; 64         loader = document.querySelectorAll('[data-gallery-role="gallery-placeholder"] [data-role="loader"]')[0];
65  65 
66     if (config.navtype === 'horizontal') { 66     if (config.navtype === 'horizontal') {
67         thumbBarHeight = config.thumbheight; 67         thumbBarHeight = config.thumbheight;
68     } 68     }
69  69 
70     loader.style.paddingBottom = ( config.height / config.width * 100) + "%"; 70     loader.style.paddingBottom = ( config.height / config.width * 100) + "%";
71 </script> 71 </script>
72 <script type="text/x-magento-init"> 72 <script type="text/x-magento-init">
73     { 73     {
74         "[data-gallery-role=gallery-placeholder]": { 74         "[data-gallery-role=gallery-placeholder]": {
75             "mage/gallery/gallery": { 75             "mage/gallery/gallery": {
76                 "mixins":["magnifier/magnify"], 76                 "mixins":["magnifier/magnify"],
77                 "magnifierOpts": <?= /* @escapeNotVerified */ $block->getMagnifier() ?>, 77                 "magnifierOpts": <?= /* @escapeNotVerified */ $block->getMagnifier() ?>,
78                 "data": <?= /* @escapeNotVerified */ $block->getGalleryImagesJson() ?>, 78                 "data": <?= /* @escapeNotVerified */ $block->getGalleryImagesJson() ?>,
79                 "options": { 79                 "options": {
80                     "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/nav") ?>", 80                     "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/nav") ?>",
81                     <?php if (($block->getVar("gallery/loop"))): ?> 81                     <?php if (($block->getVar("gallery/loop"))): ?>
82                         "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ?>, 82                         "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ?>,
83                     <?php endif; ?> 83                     <?php endif; ?>
84                     <?php if (($block->getVar("gallery/keyboard"))): ?> 84                     <?php if (($block->getVar("gallery/keyboard"))): ?>
85                         "keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ?>, 85                         "keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ?>,
86                     <?php endif; ?> 86                     <?php endif; ?>
87                     <?php if (($block->getVar("gallery/arrows"))): ?> 87                     <?php if (($block->getVar("gallery/arrows"))): ?>
88                         "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ?>, 88                         "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ?>,
89                     <?php endif; ?> 89                     <?php endif; ?>
90                     <?php if (($block->getVar("gallery/allowfullscreen"))): ?> 90                     <?php if (($block->getVar("gallery/allowfullscreen"))): ?>
91                         "allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ?>, 91                         "allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ?>,
92                     <?php endif; ?> 92                     <?php endif; ?>
93                     <?php if (($block->getVar("gallery/caption"))): ?> 93                     <?php if (($block->getVar("gallery/caption"))): ?>
94                         "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ?>, 94                         "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ?>,
95                     <?php endif; ?> 95                     <?php endif; ?>
96                     "width": <?php /* @escapeNotVerified */ echo $image_width; ?>, 96                     "width": <?php /* @escapeNotVerified */ echo $image_width; ?>,
97                     "thumbwidth": <?php /* @escapeNotVerified */ echo $thumb_width; ?>, 97                     "thumbwidth": <?php /* @escapeNotVerified */ echo $thumb_width; ?>,
98                     "thumbheight": <?php /* @escapeNotVerified */ echo $thumb_height; ?>, 98                     "thumbheight": <?php /* @escapeNotVerified */ echo $thumb_height; ?>,
99                     <?php if(!$aspect_ratio): ?> 99                     <?php if(!$aspect_ratio): ?>
100                     "height": <?php /* @escapeNotVerified */ echo $image_height; ?>, 100                     "height": <?php /* @escapeNotVerified */ echo $image_height; ?>,
101                     <?php endif; ?> 101                     <?php endif; ?>
102                     "thumbmargin": <?php echo $block->getVar("gallery/thumbmargin") ?>, 102                     "thumbmargin": <?php echo $block->getVar("gallery/thumbmargin") ?>,
103                     <?php if ($block->getVar("gallery/transition/duration")): ?> 103                     <?php if ($block->getVar("gallery/transition/duration")): ?>
104                         "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/transition/duration") ?>, 104                         "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/transition/duration") ?>,
105                     <?php endif; ?> 105                     <?php endif; ?>
106                     "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/transition/effect") ?>", 106                     "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/transition/effect") ?>",
107                     <?php if (($block->getVar("gallery/navarrows"))): ?> 107                     <?php if (($block->getVar("gallery/navarrows"))): ?>
108                         "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ?>, 108                         "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ?>,
109                     <?php endif; ?> 109                     <?php endif; ?>
110                     "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>", 110                     "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
111                     "navdir": "<?= /* @escapeNotVerified */ $thumbnail_type ?>" 111                     "navdir": "<?= /* @escapeNotVerified */ $thumbnail_type ?>"
112                 }, 112                 },
113                 "fullscreen": { 113                 "fullscreen": {
114                     "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/nav") ?>", 114                     "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/nav") ?>",
115                     <?php if ($block->getVar("gallery/fullscreen/loop")): ?> 115                     <?php if ($block->getVar("gallery/fullscreen/loop")): ?>
116                         "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ?>, 116                         "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ?>,
117                     <?php endif; ?> 117                     <?php endif; ?>
118                     "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navdir") ?>", 118                     "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navdir") ?>",
119                     <?php if ($block->getVar("gallery/transition/navarrows")): ?> 119                     <?php if ($block->getVar("gallery/transition/navarrows")): ?>
120                         "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ?>, 120                         "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ?>,
121                     <?php endif; ?> 121                     <?php endif; ?>
122                     "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navtype") ?>", 122                     "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navtype") ?>",
123                     <?php if ($block->getVar("gallery/fullscreen/arrows")): ?> 123                     <?php if ($block->getVar("gallery/fullscreen/arrows")): ?>
124                         "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ?>, 124                         "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ?>,
125                     <?php endif; ?> 125                     <?php endif; ?>
126                     <?php if ($block->getVar("gallery/fullscreen/caption")): ?> 126                     <?php if ($block->getVar("gallery/fullscreen/caption")): ?>
127                         "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ?>, 127                         "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ?>,
128                     <?php endif; ?> 128                     <?php endif; ?>
129                     <?php if ($block->getVar("gallery/fullscreen/transition/duration")): ?> 129                     <?php if ($block->getVar("gallery/fullscreen/transition/duration")): ?>
130                         "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/duration") ?>, 130                         "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/duration") ?>,
131                     <?php endif; ?> 131                     <?php endif; ?>
132                     "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/effect") ?>" 132                     "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/effect") ?>"
133                 }, 133                 },
134                 "breakpoints": <?= /* @escapeNotVerified */ $block->getBreakpoints() ?> 134                 "breakpoints": <?= /* @escapeNotVerified */ $block->getBreakpoints() ?>
135             } 135             }
136         } 136         }
137     } 137     }
138 </script> 138 </script>
    139 <script type="text/javascript">
    140 require([
    141     'jquery'
    142 ], function ($) {
    143     $(document).on('fotorama:load', function(e, fotorama, extra){
    144         if($('.loading-mask').length>0)
    145             $('.loading-mask').remove();
    146     });
    147 });
    148 </script>
139 <style type="text/css"> 149 <style type="text/css">
140   @media (min-width: 768px) { 150   @media (min-width: 768px) {
141       .product.media { 151       .product.media {
142           width: 50% !important; 152           width: 50% !important;
143       } 153       }
144       .product-info-main { 154       .product-info-main {
145           width: 50% !important; 155           width: 50% !important;
146       } 156       }
147   } 157   }
148 </style> 158 </style>